appDisplay/baseAppView: Cleanup animate()

Simplify the opacity dance to simply setting it to the initial value
before animating (0 when animating in, and 255 when animating out),
and to the final value after the spring animation is done (vice-versa).

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1518>

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 1fd088ebf02acbf5e7e47799917c079965a7ab15..d1af384d179836538bc4aabaa128446c4bd4beda 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -670,7 +670,6 @@ var BaseAppView = GObject.registerClass({
     }
 
     _doSpringAnimation(animationDirection) {
-        this._grid.opacity = 255;
         this._grid.animateSpring(
             animationDirection,
             Main.overview.dash.showAppsButton);
@@ -688,15 +687,16 @@ var BaseAppView = GObject.registerClass({
     }
 
     animate(animationDirection, onComplete) {
-        if (onComplete) {
-            let animationDoneId = this._grid.connect('animation-done', () => {
-                this._grid.disconnect(animationDoneId);
+        const animationDoneId = this._grid.connect('animation-done', () => {
+            this._grid.disconnect(animationDoneId);
+            this._grid.opacity =
+                animationDirection === IconGrid.AnimationDirection.IN
+                    ? 255 : 0;
+            if (onComplete)
                 onComplete();
-            });
-        }
+        });
 
         this._clearAnimateLater();
-        this._grid.opacity = 255;
 
         if (animationDirection == IconGrid.AnimationDirection.IN) {
             const doSpringAnimationLater = laterType => {
@@ -708,18 +708,18 @@ var BaseAppView = GObject.registerClass({
                     });
             };
 
+            this._grid.opacity = 0;
             if (this._viewIsReady) {
-                this._grid.opacity = 0;
                 doSpringAnimationLater(Meta.LaterType.IDLE);
             } else {
                 this._viewLoadedHandlerId = this.connect('view-loaded',
                     () => {
                         this._clearAnimateLater();
-                        this._grid.opacity = 255;
                         doSpringAnimationLater(Meta.LaterType.BEFORE_REDRAW);
                     });
             }
         } else {
+            this._grid.opacity = 255;
             this._doSpringAnimation(animationDirection);
         }
     }